Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ci): noir mirror base commit #4969

Merged
merged 5 commits into from
Mar 6, 2024
Merged

Conversation

ludamad
Copy link
Collaborator

@ludamad ludamad commented Mar 5, 2024

Now we are truly not using the noir .gitrepo file at all, except as a pull utility. We just find the last merge on Noir side. However, care should be taken that any conflicts that were fixed in the noir sync branch should make their way into aztec packages before a merge.

Fixes #4961.
Also makes sure commit messages pushed to Noir's branch reference full aztec-packages PR links.

@ludamad ludamad requested a review from TomAFrench March 5, 2024 22:24
@ludamad ludamad marked this pull request as ready for review March 5, 2024 23:00
@ludamad
Copy link
Collaborator Author

ludamad commented Mar 5, 2024

@TomAFrench fixed the issue, see example noir-lang/noir#4485 - however note any fixups on Noir side should be pulled over from aztec-packages before merging, otherwise they will crop up again.

Copy link
Member

@TomAFrench TomAFrench left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@TomAFrench TomAFrench merged commit 546c666 into master Mar 6, 2024
11 checks passed
@TomAFrench TomAFrench deleted the ad/fix-noir-base-commit branch March 6, 2024 13:13
PhilWindle pushed a commit that referenced this pull request Mar 6, 2024
🤖 I have created a release *beep* *boop*
---


<details><summary>aztec-package: 0.26.4</summary>

##
[0.26.4](aztec-package-v0.26.3...aztec-package-v0.26.4)
(2024-03-06)


### Miscellaneous

* **aztec-package:** Synchronize aztec-packages versions
</details>

<details><summary>barretenberg.js: 0.26.4</summary>

##
[0.26.4](barretenberg.js-v0.26.3...barretenberg.js-v0.26.4)
(2024-03-06)


### Miscellaneous

* **barretenberg.js:** Synchronize aztec-packages versions
</details>

<details><summary>aztec-cli: 0.26.4</summary>

##
[0.26.4](aztec-cli-v0.26.3...aztec-cli-v0.26.4)
(2024-03-06)


### Miscellaneous

* **aztec-cli:** Synchronize aztec-packages versions
</details>

<details><summary>aztec-packages: 0.26.4</summary>

##
[0.26.4](aztec-packages-v0.26.3...aztec-packages-v0.26.4)
(2024-03-06)


### Features

* **avm:** ALU &lt;--&gt; MAIN inter table relation on intermediate
registers copy
([#4945](#4945))
([8708131](8708131)),
closes
[#4613](#4613)
* Circuit checker class
([#4931](#4931))
([4eba266](4eba266))
* Compute out hash in circuits
[#4561](#4561)
([#4873](#4873))
([06a9116](06a9116))


### Bug Fixes

* **ci:** Noir mirror base commit
([#4969](#4969))
([546c666](546c666))
* Fix release
([#4994](#4994))
([19a8728](19a8728))


### Miscellaneous

* Use public constructors where possible
([#4937](#4937))
([225aad6](225aad6))
</details>

<details><summary>barretenberg: 0.26.4</summary>

##
[0.26.4](barretenberg-v0.26.3...barretenberg-v0.26.4)
(2024-03-06)


### Features

* **avm:** ALU &lt;--&gt; MAIN inter table relation on intermediate
registers copy
([#4945](#4945))
([8708131](8708131)),
closes
[#4613](#4613)
* Circuit checker class
([#4931](#4931))
([4eba266](4eba266))
</details>

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
AztecBot added a commit to AztecProtocol/barretenberg that referenced this pull request Mar 7, 2024
🤖 I have created a release *beep* *boop*
---


<details><summary>aztec-package: 0.26.4</summary>

##
[0.26.4](AztecProtocol/aztec-packages@aztec-package-v0.26.3...aztec-package-v0.26.4)
(2024-03-06)


### Miscellaneous

* **aztec-package:** Synchronize aztec-packages versions
</details>

<details><summary>barretenberg.js: 0.26.4</summary>

##
[0.26.4](AztecProtocol/aztec-packages@barretenberg.js-v0.26.3...barretenberg.js-v0.26.4)
(2024-03-06)


### Miscellaneous

* **barretenberg.js:** Synchronize aztec-packages versions
</details>

<details><summary>aztec-cli: 0.26.4</summary>

##
[0.26.4](AztecProtocol/aztec-packages@aztec-cli-v0.26.3...aztec-cli-v0.26.4)
(2024-03-06)


### Miscellaneous

* **aztec-cli:** Synchronize aztec-packages versions
</details>

<details><summary>aztec-packages: 0.26.4</summary>

##
[0.26.4](AztecProtocol/aztec-packages@aztec-packages-v0.26.3...aztec-packages-v0.26.4)
(2024-03-06)


### Features

* **avm:** ALU &lt;--&gt; MAIN inter table relation on intermediate
registers copy
([#4945](AztecProtocol/aztec-packages#4945))
([8708131](AztecProtocol/aztec-packages@8708131)),
closes
[#4613](AztecProtocol/aztec-packages#4613)
* Circuit checker class
([#4931](AztecProtocol/aztec-packages#4931))
([4eba266](AztecProtocol/aztec-packages@4eba266))
* Compute out hash in circuits
[#4561](AztecProtocol/aztec-packages#4561)
([#4873](AztecProtocol/aztec-packages#4873))
([06a9116](AztecProtocol/aztec-packages@06a9116))


### Bug Fixes

* **ci:** Noir mirror base commit
([#4969](AztecProtocol/aztec-packages#4969))
([546c666](AztecProtocol/aztec-packages@546c666))
* Fix release
([#4994](AztecProtocol/aztec-packages#4994))
([19a8728](AztecProtocol/aztec-packages@19a8728))


### Miscellaneous

* Use public constructors where possible
([#4937](AztecProtocol/aztec-packages#4937))
([225aad6](AztecProtocol/aztec-packages@225aad6))
</details>

<details><summary>barretenberg: 0.26.4</summary>

##
[0.26.4](AztecProtocol/aztec-packages@barretenberg-v0.26.3...barretenberg-v0.26.4)
(2024-03-06)


### Features

* **avm:** ALU &lt;--&gt; MAIN inter table relation on intermediate
registers copy
([#4945](AztecProtocol/aztec-packages#4945))
([8708131](AztecProtocol/aztec-packages@8708131)),
closes
[#4613](AztecProtocol/aztec-packages#4613)
* Circuit checker class
([#4931](AztecProtocol/aztec-packages#4931))
([4eba266](AztecProtocol/aztec-packages@4eba266))
</details>

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

aztec-sync PRs in noir are building off of old commits resulting in conflicts
2 participants